From 0e5aa84479600694218c6136795a60339d54ee80 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Thu, 30 Dec 2004 18:30:47 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.519 (41d44957j43cN3y5xTzmQ9SDquPlbQ) Fix extern declarations in VMX code. They looked okay to me, but GCC sometimes barfed on them. --- xen/arch/x86/vmx.c | 7 +++---- xen/arch/x86/vmx_io.c | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/vmx.c b/xen/arch/x86/vmx.c index f42c596592..53f5643580 100644 --- a/xen/arch/x86/vmx.c +++ b/xen/arch/x86/vmx.c @@ -38,6 +38,9 @@ int vmcs_size; unsigned int opt_vmx_debug_level; +extern long evtchn_send(int lport); +extern long do_block(void); + int start_vmx() { struct vmcs_struct *vmcs; @@ -307,9 +310,6 @@ static void vmx_io_instruction(struct xen_regs *regs, unsigned long addr; unsigned long eip; - extern long evtchn_send(int lport); - extern long do_block(void); - __vmread(GUEST_EIP, &eip); VMX_DBG_LOG(DBG_LEVEL_1, @@ -618,7 +618,6 @@ static inline void vmx_do_msr_read(struct xen_regs *regs) */ static inline void vmx_vmexit_do_hlt() { - extern long do_block(void); #if VMX_DEBUG unsigned long eip; __vmread(GUEST_EIP, &eip); diff --git a/xen/arch/x86/vmx_io.c b/xen/arch/x86/vmx_io.c index 881e297549..02333531a1 100644 --- a/xen/arch/x86/vmx_io.c +++ b/xen/arch/x86/vmx_io.c @@ -30,6 +30,8 @@ #include #include +extern long do_block(); + void vmx_io_assist(struct exec_domain *ed) { vcpu_iodata_t *vio; @@ -37,7 +39,6 @@ void vmx_io_assist(struct exec_domain *ed) struct domain *d = ed->domain; execution_context_t *ec = get_execution_context(); unsigned long old_eax; - extern long do_block(); unsigned long eflags; int dir; @@ -208,8 +209,6 @@ void vmx_intr_assist(struct exec_domain *d) void vmx_do_resume(struct exec_domain *d) { - extern long do_block(); - __vmwrite(HOST_CR3, pagetable_val(d->mm.monitor_table)); __vmwrite(GUEST_CR3, pagetable_val(d->mm.shadow_table)); __vmwrite(HOST_ESP, (unsigned long) get_stack_top()); -- 2.30.2